Weekend bug fixes