More tidy ups pre patch generation