Fixes and patches