Fixes for void return value and forwarding invocations