fixed setup issues