Modifications to make build work

Signed-off-by: Stefan Prisca <stefan.prisca@gmail.com>