Minor modifications for 1st compilation in new directory
Signed-off-by: H.K. Wong <hk@woohing.net>