couple more bug catches