d155: further fixes by Xotic