Still more bug fixes!