Minor tweaks to prevent JSlint errors