boxfort: Fixed various issues with 66b360c
boxfort: Fixed various issues with 66b360c

a1lu/Criterion,Snaipe/Criterion,offa/Criterion,am11/Criterion,am11/Criterion,offa/Criterion,Snaipe/Criterion,offa/Criterion,Snaipe/Criterion,a1lu/Criterion,a1lu/Criterion,a1lu/Criterion,a1lu/Criterion,am11/Criterion,Snaipe/Criterion,offa/Criterion,am11/Criterion,offa/Criterion,am11/Criterion,Snaipe/Criterion