Add ruaumoko dependency
Fix a couple of embarassing mistakes