Bug fixes for all phases up to Senate