Misc fixes - formatting and notice fixes