Directives

Fix missing `cssUrl` while cloning.

Misc cleanup.