Minor bug fixes to include new systems / variables