some fixes which was introduced with the latest patches