Couple tweaks to RickMcSlick