more static function fixes