Changes made prior to no-server hack