Fixes/additions