Added couple more tweaks to recent refactoring