Monday morning bug fixes