Fixing setup bugs