Fixing figures issues