Fixes to make it work.
Merge branch 'okeuday-master'