Fixed remaining two issues