Multiple small fixes based on going live