Various fixes/additions