Added config option for poop + fix building