Updated some issues with CheckActive