Fixes: part 2