Apparatus fix

Fixed a few odd apparatus issues.
Emic-167