1 2014 alpha fixes

Hey! A few more changes to be tested on the server. 

- Frank