Fix of old things

There u go (@alexander)