* Minor fixes and performance improvements