Fix bugs - round one