#140: Last corrections