Fixed lazy mistakes