Minor error fixes/tweaks