Fix review comments from luks