Fixes

Fixed recommendations by Andrew