Some bug fixes regading maven...