small fixes to get the current version working