Fixing basic stuffs