Updated to layer 19. Fixed bug in code generator