Bugfixes on 11/11/14