Fix misc #2