Resolve some more import issues in layers.models