Bug fixes

extract consts