This morning's bug fixes