Cosmetic improvements and fixing bug where not enough resources are reserved