Fix setup issues