Fixes & additions