Fixes app and server with missing stuff