Fix grunt images handling and 'serve:dist' target.