Still more bug fixes