Fixes minor issuess