Temporary fixes so that testing can continue