[BUGFIX] Some small fixes