Fixes on quote system