Some consts fixed