Inital fixes
Small fixes