Fixed issues due to constness in GIT fbc