Minor details: Commit 15/4