[BUGFIX] Minor fixes