Small changes for consistency and overflow fix