Fixes & fmt