Fixes for matias's comments