Fix some flaws with loading on servers.