moved more stuff to oscommon