Fixed issues with Aslan first commit