Small changes to initial import