Some fixes and trixes.