Few bug updates.