fix issues after cleanup