Minor changes for bat bounce fix