Fixed 2 little bugs