Fixes & externs