fixes for Dart 1.8

closes #262 

@vsavkin could you please review the 2nd commit ?