last of the fixes I hope