Initial setup fixes.