More Fixes - still unfinished