Some fixes

fixes