Another iteration of fixes