Fixed Return Statements and boost dependancies