Slight performance improvements