Adding small fixes- There will be alot of commits with this same message