Solve some QA issues and fix null exceptions on getFigures()