Fixes

List of fixes that might be helpful for other DIYers.