Issues Fixes

Fixes to previous issues.