Fixed mutable variable setter
Minor improvements