Minor fixes/additions