Dictionary fixes