Various fixes

property