Minor fixes/cleanup