More GenLayer fixes