Fixes: part 3