Fixed two minor issues