Some more fixes/additions