Improve behavior on non-built sites