Final fixes for now