Move the system check into the right place
Small cosmetic changes; fix remaining scissor lift bugs