Small tweaks to iron out some kinks