Small tweaks to @ rules