Got things updated to work better on more system types