Performance Fixes by mikerino