#372: Changes and fixes