All last fixes