[1.3.3] random improvements