Mayor bug fixes!