Added a few more fixes for Volume 2