[Fix] Fixing problems from review