Fixing basic issues