Fix function "getCurrent" (version) + minor bug fixes