Exclude dimensions for fluid images
/CC @lizlux
Minor fixes per feedback