Minor fixes - still not working