OTDK pages and additional fixes

Fixes compile errors on Travis.
Based on the work of @darvasd.