Supposedly last fixes