Fixed 2 irritating bugs