Some initial setup fixes