Fixes for more configurability