Quick fixes

@fcduarte PTAL