Small finishing fixes. Works dual platform #44