Fixes from dot syntax removal