Various update for our style