Fixes & changes