manual last fixes