Changes for smartos support