fixes - more of them