Done with initial fixes