some minor fixes after cleanup