fixes to build
fixes build (minor refactorings)
feedback
Merge pull request #228 from pfalabella/fixes

fixes to build
r=aochagavia