- Fixed various ATM issues