Fixes to help from Brandon