Fixes for calculating raw_critical value

Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>