Fix for Mike's requests in #326