Further backwards compatbility fixes