More # fixes