migrated from fox
small fixes