Minor fixes and enchachements