small fixes and configurations