Do some fixes