Some cleanups in gui/player callbacks