Slight performance tweeks