Fixed little bugs