Lifted two bugs