Fix bugs reported by Aki