Minor Fixes

Fix for *Poof* messages is still required.