Some fixes in mechanics work.