Prevent needless refresh
Minor refresh fix
Merged changes into branch