Some setup fixes