Moar code pro fixes

Author: lhunker