Forced Update and bug fixes