Fixes and small updates