Installation fixes, cleanup and translation