Birthday Bug fixes