Some fixes

May need corrections