Permissions Fixes (and small cleanup)