Some more changes for the method compilation... still broken