More fixes for empty resource stamping