[nim, billy] #X Fixing build porblems. Restoring stubs to real object