minor fixes and patches