Profile and fixes