Move configurable constants to init for bc
Small cleanups