multiple fixes

multiple fixes?