Fixed debug build

[~] Some misc changes