Fixed even smaller bugs