Fixed forgotten mistakes