Minor fixes due to compatibility