Improvements to Machine & Stock interfaces.