Fixed physics issues