Fixes & more