Misc cleanup of warnings and spamming when approaching, this also fixed compile issues after the last commit