Fixes for plain setups