fixes and patches