Fixing build & config