Fixes: part 1