Fixes & ports