Change some defaults, fix Photon