Crypsis: Cleanup and fixes issues