Feature hmvc crypsis fixes